From fdb9a18698c9ab8e8e8e875f20184b4aa5d62825 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 10 May 2016 14:37:00 +0100 Subject: [PATCH] sched/rt: Fix memory leak in rt_init() c/s 2656bc7b0 "xen: adopt .deinit_pdata and improve timer handling" introduced a error path into rt_init() which leaked prv if the allocation of prv->repl_timer failed. Introduce an error cleanup path. Spotted by Coverity. Signed-off-by: Andrew Cooper Reviewed-by: Meng Xu Release-acked-by: Wei Liu --- CC: George Dunlap CC: Dario Faggioli --- xen/common/sched_rt.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 7f8f411260..aa3ffd20d2 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -581,6 +581,7 @@ replq_reinsert(const struct scheduler *ops, struct rt_vcpu *svc) static int rt_init(struct scheduler *ops) { + int rc = -ENOMEM; struct rt_private *prv = xzalloc(struct rt_private); printk("Initializing RTDS scheduler\n" @@ -588,11 +589,11 @@ rt_init(struct scheduler *ops) "Use at your own risk.\n"); if ( prv == NULL ) - return -ENOMEM; + goto err; prv->repl_timer = xzalloc(struct timer); if ( prv->repl_timer == NULL ) - return -ENOMEM; + goto err; spin_lock_init(&prv->lock); INIT_LIST_HEAD(&prv->sdom); @@ -603,8 +604,16 @@ rt_init(struct scheduler *ops) cpumask_clear(&prv->tickled); ops->sched_data = prv; + rc = 0; - return 0; + err: + if ( rc && prv ) + { + xfree(prv->repl_timer); + xfree(prv); + } + + return rc; } static void -- 2.30.2